tests: add CHECK_CONV_FLOAT to common.inc

Like CHECK_CONV, but for floating point destination types.

Use CHECK_CONV_FLOAT in hsva.c and hsl.c, instead of custom
CHECK_CONV implementations.  To be used by another test soon.

diff --git a/tests/common.inc b/tests/common.inc
index 501644abb0fa8cb8804e4e4cb551fecb6fbda92c..bca5056f856110adb335e7f10612708f63f73130 100644 (file)
--- a/tests/common.inc
+++ b/tests/common.inc
@@ -1,4 +1,5 @@
 
+#include <math.h>
 #include "babl/babl-introspect.h"
 
 #define CHECK_CONV(test_name, componenttype, src_fmt, dst_fmt, src_pix, expected_pix) \
@@ -25,3 +26,28 @@
         }       \
     }       \
   }
+
+#define CHECK_CONV_FLOAT(test_name, componenttype, max_error, src_fmt, dst_fmt, src_pix, expected_pix) \
+  {       \
+  const Babl *fish;       \
+  int i;       \
+  fish = babl_fish (src_fmt, dst_fmt);       \
+  if (!fish)       \
+    {       \
+      printf ("  %s failed to make fish\n", test_name);       \
+      OK = 0;       \
+    }       \
+  for (i = 0; i < sizeof(src_pix)/sizeof(src_pix[0]); i ++)       \
+    {       \
+      int c;\
+      componenttype result[10];       \
+      babl_process (fish, src_pix[i], result, 1);       \
+      for (c = 0; c < sizeof(expected_pix[i])/sizeof(expected_pix[i][0]); c++) \
+      if (fabs(result[c] - expected_pix[i][c]) > max_error)       \
+        {       \
+          printf (" %s failed #%i[%i]  got %lf expected %lf\n", test_name, i, c, result[c], expected_pix[i][c]);       \
+          OK = 0;          \
+          babl_introspect((Babl *)fish); \
+        }       \
+    }       \
+  }

diff --git a/tests/hsl.c b/tests/hsl.c
index 4b24db21d405e80d8fee44a53afeb4efd8c326b6..ab7174763d4601261d7cde9b3bbda48999c42adb 100644 (file)
--- a/tests/hsl.c
+++ b/tests/hsl.c
@@ -15,36 +15,12 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#include <math.h>
 #include <stdio.h>
 
 #include "config.h"
 #include "babl.h"
 
-#define CHECK_CONV(test_name, componenttype, src_fmt, dst_fmt, src_pix, expected_pix) \
-  {                                                                     \
-    const Babl *fish;                                                   \
-    int i;                                                              \
-    fish = babl_fish (src_fmt, dst_fmt);                                \
-    if (!fish)                                                          \
-      {                                                                 \
-        printf ("  %s failed to make fish\n", test_name);               \
-        OK = 0;                                                         \
-      }                                                                 \
-    for (i = 0; i < sizeof(src_pix)/sizeof(src_pix[0]); i ++)           \
-      {                                                                 \
-        int c;                                                          \
-        componenttype result[10];                                       \
-        babl_process (fish, src_pix[i], result, 1);                     \
-        for (c = 0; c < sizeof(expected_pix[i])/sizeof(expected_pix[i][0]); c++) \
-          if (fabs(result[c] - expected_pix[i][c]) > 0.001)             \
-            {                                                           \
-              printf (" %s failed #%i[%i]  got %lf expected %lf\n",     \
-                      test_name, i, c, result[c], expected_pix[i][c]);  \
-              OK = 0;                                                   \
-            }                                                           \
-      }                                                                 \
-  }
+#include "common.inc"
 
 
 int
@@ -95,15 +71,15 @@ main (int    argc,
 
   babl_init ();
 
-  CHECK_CONV ("rgba to hsla ", float,
-              babl_format ("RGBA float"),
-              babl_format ("HSLA float"),
-              rgba, hsla);
+  CHECK_CONV_FLOAT ("rgba to hsla ", float, 0.001,
+                    babl_format ("RGBA float"),
+                    babl_format ("HSLA float"),
+                    rgba, hsla);
 
-  CHECK_CONV ("hsla to rgba ", float,
-              babl_format ("HSLA float"),
-              babl_format ("RGBA float"),
-              hsla, rgba);
+  CHECK_CONV_FLOAT ("hsla to rgba ", float, 0.001,
+                    babl_format ("HSLA float"),
+                    babl_format ("RGBA float"),
+                    hsla, rgba);
 
   babl_exit ();
 

diff --git a/tests/hsva.c b/tests/hsva.c
index a29f506c1480e33f4c7707cc83891100ae3343d0..97a723a88169cc757bf168c60dded85ba00c88de 100644 (file)
--- a/tests/hsva.c
+++ b/tests/hsva.c
@@ -24,34 +24,11 @@
 
 #include "config.h"
 #include <stdlib.h>
-#include <math.h>
 #include <stdio.h>
 #include <assert.h>
 #include "babl.h"
 
-#define CHECK_CONV(test_name, componenttype, src_fmt, dst_fmt, src_pix, expected_pix) \
-  {       \
-  const Babl *fish;       \
-  int i;       \
-  fish = babl_fish (src_fmt, dst_fmt);       \
-  if (!fish)       \
-    {       \
-      printf ("  %s failed to make fish\n", test_name);       \
-      OK = 0;       \
-    }       \
-  for (i = 0; i < sizeof(src_pix)/sizeof(src_pix[0]); i ++)       \
-    {       \
-      int c;\
-      componenttype result[10];       \
-      babl_process (fish, src_pix[i], result, 1);       \
-      for (c = 0; c < sizeof(expected_pix[i])/sizeof(expected_pix[i][0]); c++) \
-      if (fabs(result[c] - expected_pix[i][c]) > 0.001)       \
-        {       \
-          printf (" %s failed #%i[%i]  got %lf expected %lf\n", test_name, i, c, result[c], expected_pix[i][c]);       \
-          OK = 0;          \
-        }       \
-    }       \
-  }
+#include "common.inc"
 
 
 int
@@ -100,15 +77,15 @@ main (int    argc,
 
   babl_init ();
 
-  CHECK_CONV ("rgba to hsva ", float,
-              babl_format ("RGBA float"),
-              babl_format ("HSVA float"),
-              rgba, hsva);
+  CHECK_CONV_FLOAT ("rgba to hsva ", float, 0.001,
+                    babl_format ("RGBA float"),
+                    babl_format ("HSVA float"),
+                    rgba, hsva);
 
-  CHECK_CONV ("hsva to rgba ", float,
-              babl_format ("HSVA float"),
-              babl_format ("RGBA float"),
-              hsva, rgba);
+  CHECK_CONV_FLOAT ("rgba to hsva ", float, 0.001,
+                    babl_format ("HSVA float"),
+                    babl_format ("RGBA float"),
+                    hsva, rgba);
 
   babl_exit ();